iconhelper: Stop tracking state
authorBenjamin Otte <otte@redhat.com>
Tue, 1 Dec 2015 18:51:44 +0000 (19:51 +0100)
committerBenjamin Otte <otte@redhat.com>
Tue, 1 Dec 2015 23:29:31 +0000 (00:29 +0100)
The iconfactory code doesn't use it anymore, so we don't need to track
it either.

gtk/gtkiconhelper.c

index b6b581d51d6316e9643b050850634d4950bb477c..25fec55db87af7339ce383bc75c4185415f2927c 100644 (file)
@@ -40,7 +40,6 @@ struct _GtkIconHelperPrivate {
   guint force_scale_pixbuf : 1;
 
   cairo_surface_t *rendered_surface;
-  GtkStateFlags last_surface_state;
   gint last_surface_scale;
 };
 
@@ -71,7 +70,6 @@ _gtk_icon_helper_clear (GtkIconHelper *self)
   self->priv->def = gtk_image_definition_new_empty ();
 
   self->priv->icon_size = GTK_ICON_SIZE_INVALID;
-  self->priv->last_surface_state = GTK_STATE_FLAG_NORMAL;
   self->priv->last_surface_scale = 0;
 }
 
@@ -272,18 +270,14 @@ static gboolean
 check_invalidate_surface (GtkIconHelper *self,
                          GtkStyleContext *context)
 {
-  GtkStateFlags state;
   int scale;
 
-  state = gtk_style_context_get_state (context);
   scale = get_scale_factor (self, context);
 
   if ((self->priv->rendered_surface != NULL) &&
-      (self->priv->last_surface_state == state) &&
       (self->priv->last_surface_scale == scale))
     return FALSE;
 
-  self->priv->last_surface_state = state;
   self->priv->last_surface_scale = scale;
 
   if (self->priv->rendered_surface)